Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Custom textures, multiple descriptor sets #12

Merged
merged 9 commits into from
Sep 21, 2023
Merged

Custom textures, multiple descriptor sets #12

merged 9 commits into from
Sep 21, 2023

Conversation

xirreal
Copy link
Contributor

@xirreal xirreal commented Sep 16, 2023

Binds customtex0 if available to binding 7 in the descriptor set.

Internally, shared images and image views now support one, two and three dimensional images.

@xirreal
Copy link
Contributor Author

xirreal commented Sep 18, 2023

PNG custom textures are now supported.

@xirreal xirreal changed the title Allow customtex0 to be used in VK shaders Custom textures, multiple descriptor sets Sep 20, 2023
@xirreal
Copy link
Contributor Author

xirreal commented Sep 20, 2023

PR now supports all custom textures defined in shader.properties.
Changes how descriptor sets are organized.

  • Set 0 contains all the uniforms, acceleration structure data and the output image.
  • Moved output image to binding 6, to allow easier addition of more output images without moving other bindings.
  • Set 1 contains custom textures, ordered alphabetically.
  • Set 2 contains SSBOs, ordered by their binding id.

@MCRcortex MCRcortex merged commit 3995adc into MCRcortex:master Sep 21, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@xirreal @MCRcortex